Implemented the Latest Changes