Final changes to availability updating