many changes still need to be made