More functionality logic in place