Added some extra potential features