Trimmed down and made more responsive