added year long, modifed some others