number of improvements

- fully classified logic