removing stupid hardcoding