Added basic changes