removed premature features to resolve bug#7