Few things added, work in progress