made some temporary changes to methods