Major rewrite part 3