Added js and activation functions