Special update for Lemon who done 

most of the coding!