added first version
updated highlighting