Processing different data + minor bug fix