changes from jaiok git