final version with right message in home