final touches ... :P