Removed harcoding