changed to work with nameless