change comments and main