Updated it a little