Fix bug, remove year hardcode