Comments and main changed