update, bugs included