made changes to return extra information
why
hate this
??