Working on some features