made some minor changes still in correction phase