Cleaned up overlay