made fixes for using 620
made fixes for using 620