Rest of features hopefully with problem resolved