Started polishing stuff