edits for compatilbility