Added optional changes and new parts