Re-tweaking for development