Loading was added and some customizations