Changes and added features