more updates to make development more friendly
fixing merge