Add evening and DRY up