Changed creation, modified format #478