#project v2: Changes by Hamza