Added in slightly better loan handling