Changed argument handling, played with classes