moved to sensible places