refactor amnesic / couchie