adding more auto-loading