many many changes to make it work better with lucine search