Re-arrange specification, more clear now