Added the rest from last commit