less getting in the way + some additions