Removed hard coded size