minor changes
added support for SPP