Added part of implementation