mixing my code base