Updated: amended classes to make it mobile friendly