finished ps6
added ps7