adjusted make script and keys