Major improvements, partially works