changed data structure a bit