Adding simple logic to add goal