buncha stuff added