Some updates

Try to merge now