[ImP] Improved code and fullfilled all requirements and done without session.