Position correction added. Need to be refactored