Added all kinda of stuff