improve events loader