More work going into improving the flow of the logic