a bit modified in order to keep both projects working