Partial SDL commit