Changed to fragment and cleanup