working calendar but js still combined