added work in progress code