Working on the +@ bug. Changed database column names to fit relations.