Added some stuff for Lab4