no more bugs at update, now full working