Changed a little bit for merging another branch