added couple more things