adding loader, fixing observer