Resolved #1 and added action functions.