Organized specs a bit...