updates, works well now