updated cash view
merged changes