Decided to change some conventions.