More polishing to the current (working) version