Final Modfications

Done