added couple more functions