moved specs to more fitting places