Changed style and added week checking capability