Few Last tweaks and changes