Needed changes implemented