Added some code to save space