deleted hardcoding