added feature (not yet finished)