UGLY - some extra changes