general improvements, buggy version