removed $options param as it causes more problems than it solves