major update, no more loading required