Few Changes Implemented