deleted harcoded stuff