working on traits
fixing ugly bug