More preview work. Simplify and tune for better performance.