updated, ready to commit