Added the clock and fixed std