Applied stuff of last commit to this…