Work in Progress

Some changes