Modified make and main