addressed @angelos comments