Constants commonized, added Buggy