Still fixing the reference issues