merging with laptop dev
final merge