added nops
merged mains for correct structure