Added all needed stuff