Updated workout class