Super fancy improvements