Final update, fixed loading