Removed hard-code