first set of changes to improve perfedies