New format, couple of modules added