updated with better jst module