Draft, not working, improvements