moved to amigo for further development