started removing hardcoding