merged with dans stuff