Changes have been made to decouple functionality from HomeActivity