revmoing hardcoded stuff