new loader. small adjustments