This method probably needs to be implemented in Homescreen app too?