Adding master code for proper merge with master