Updated version tested