Implemenation of PS4
merge commit