adjusted methods so they.. actually work