Stable version with most of issues resolved