Removing availability and minor changes :)