added more chekcs