Fixed some logic with the new banking system