done work on SP a bit