Updates from wateRmelon source and removed unecessary code
Date change