Changed script to use keywords