version with attributes was added | some bugs fixed