removed logging, fixed ordering