Updating availability fully working...
before merging