modified hard-code work