big update, sorry for delay