Subtracting satalite dish commit (to retain compatibility with current version - will readd it later)