cleaned up and added interactions