Lastest code without timestamps