more code added, basic framework improved