continuing simplyfing main module