Further changes, minimized code