Removed hard codes