More tweaks added Notes