changed hardcoded stuff left over from testing