Tweaked

Added year, and optimized month