added more featrues